gitweb / test / file with spaceson commit merge-recursive: adjust to loosened "working file clobbered" check (65ac6e9)
   1This
   2filename
   3contains
   4spaces.